upgrade/switch: Fix status line being overwritten with pull progress

diff --git a/src/ostree/ot-admin-builtin-switch.c b/src/ostree/ot-admin-builtin-switch.c
index d1306cf47046ecf587497cd53033fe16f533eb0d..87f5893b36ec061ee9704f34ad28fb6d8378e793 100644 (file)
--- a/src/ostree/ot-admin-builtin-switch.c
+++ b/src/ostree/ot-admin-builtin-switch.c
@@ -105,6 +105,8 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell
       GSConsole *console;
       gs_unref_object OstreeAsyncProgress *progress = NULL;
 
+      g_print ("Fetching remote %s ref %s\n", origin_remote, new_ref);
+
       console = gs_console_get ();
       if (console)
         {
@@ -112,8 +114,6 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell
           progress = ostree_async_progress_new_and_connect (ot_common_pull_progress, console);
         }
 
-      g_print ("Fetching remote %s ref %s\n", origin_remote, new_ref);
-
       if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, pullflags, progress,
                              cancellable, error))
         goto out;

diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c
index 4139773957e03bbeb066fc7ca846bae6a42701d1..16a4073d2b6a97422e5a05def6765642e06b909c 100644 (file)
--- a/src/ostree/ot-admin-builtin-upgrade.c
+++ b/src/ostree/ot-admin-builtin-upgrade.c
@@ -86,6 +86,8 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
       GSConsole *console;
       gs_unref_object OstreeAsyncProgress *progress = NULL;
 
+      g_print ("Fetching remote %s ref %s\n", origin_remote, origin_ref);
+
       console = gs_console_get ();
       if (console)
         {
@@ -93,8 +95,6 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
           progress = ostree_async_progress_new_and_connect (ot_common_pull_progress, console);
         }
 
-      g_print ("Fetching remote %s ref %s\n", origin_remote, origin_ref);
-
       if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, pullflags, progress,
                              cancellable, error))
         goto out;